Merge pull request #11087 from yashodha/CRM-19850