Merge pull request #7982 from jitendrapurohit/CRM-18183