Merge pull request #8438 from yashodha/CRM-18659