Merge pull request #6597 from jitendrapurohit/CRM-12078