Merge branch 'hotfix/6.6.4'
Merge branch 'release/6.7.0'
even better analytics lol, last commit had a bug.
Merge branch 'hotfix/6.7.1' into devel