Merge pull request #10737 from jitendrapurohit/CRM-20913