Merge pull request #10515 from yashodha/CRM-20741