Merge pull request #10457 from jitendrapurohit/CRM-20675