Add Analytics
Merge branch 'hotfix/analytics'

* hotfix/analytics:
  Add Analytics