fixed analytics in core
Merge branch 'hotfix/fix-analytics-in-core'