Merge pull request #8029 from yashodha/CRM-18287