Merge pull request #8430 from yashodha/CRM-18655