Merge pull request #10436 from JMAConsulting/CRM-20655