Merge pull request #7460 from yashodha/CRM-17703