Merge pull request #9545 from JMAConsulting/CRM-19288