analytics debugging
Merge branch 'analytics' into testing