Merge pull request #8094 from yashodha/CRM-18371