Merge pull request #10439 from jitendrapurohit/CRM-20657