Merge pull request #10208 from jitendrapurohit/CRM-20461