Merge pull request #7948 from jitendrapurohit/CRM-18161