Merge branch 'development' into 'master'

Matomo and Maps Hotfix

See merge request !9
2 jobs from v2.2.2 in 1 minute and 50 seconds
Status Job ID Name Coverage
  Build
passed #7913
build

00:01:50

manual #7914
allowed to fail manual
build_shopmason