Merge changes from 2.2.2 into development

3 jobs for development in 1 minute and 46 seconds (queued for 2 seconds)
Status Job ID Name Coverage
  Build
passed #8197
build

00:01:33

manual #8198
allowed to fail manual
build_shopmason
 
  Deploy
passed #8199
deploy_staging

00:00:13