Merge pull request #7963 from jitendrapurohit/CRM-18174