Merge pull request #7754 from jitendrapurohit/CRM-17949