analytics issues resolved
Merge pull request #1688 from ssushma/dev-branch

analytics issues resolved