Merge pull request #10339 from jitendrapurohit/CRM-20558