v13-s12-hotfix-4

What's Changed

• MET-6007 Matomo Fix by @andyjmaclean in #848
• Merge develop into master by @andyjmaclean in #849

Full Changelog: v13-s12-hotfix-3...v13-s12-hotfix-4