Merge pull request #11494 from yashodha/CRM-21635