Change analytics code
Merged from master