Merge pull request #1680 from ssushma/dev-branch

Analytics conflicts resolved