Merge pull request #10324 from jitendrapurohit/CRM-20546