Merge pull request #9274 from yashodha/CRM-19511