Merge pull request #11495 from yashodha/CRM-21637