Merge pull request #9632 from yashodha/CRM-19795