Merge pull request #15789 from deepeshgarg007/production-analytics

[Bug-fix]Production analytics