Merge pull request #9598 from JMAConsulting/CRM-19585-7