Merge pull request #8095 from yashodha/CRM-18372