Merge pull request #10588 from JMAConsulting/CRM-20793