Merge pull request #7809 from jitendrapurohit/CRM-17799