Merge pull request #10692 from jitendrapurohit/CRM-20904