Merge pull request #10447 from JMAConsulting/CRM-19478