Merge pull request #10795 from jitendrapurohit/CRM-20994