Merge pull request #8081 from jitendrapurohit/CRM-18358