Merge pull request #7955 from jitendrapurohit/CRM-18167