Merge pull request #10361 from jitendrapurohit/CRM-20578