Merge pull request #7584 from jitendrapurohit/CRM-17809