Merge pull request #6481 from yashodha/CRM-16985