fix on analytics
Merge branch 'develop' into staging