Merge pull request #6912 from yashodha/CRM-17351