Merge pull request #10036 from jitendrapurohit/CRM-20329