Merge pull request #10264 from jitendrapurohit/CRM-20171