CDB-806 Modifications on google analytics
Merge CDB-806 into release/2.8.3