Merge pull request #6559 from jitendrapurohit/CRM-16877