Merge pull request #9574 from JMAConsulting/CRM-19585-1