Restricted some more analytics.
Merge branch 'master' into production