Merge pull request #6777 from yashodha/CRM-17237