20220725 rebase from upstream 2

Created by: cmeessen

Second rebase for today.

Changes proposed in this pull request:

• adds matomo support

/cc @Normo @ruester