Merge pull request #7717 from yashodha/CRM-17908