Merge pull request #10346 from JMAConsulting/CRM-20567