Merge pull request #10716 from jitendrapurohit/CRM-20933