Merge pull request #7636 from jitendrapurohit/CRM-17839