Increased efficiency on analytics reporting
Merge branch 'master' into eve