Merge pull request #10634 from JMAConsulting/CRM-20673