Merge pull request #10210 from JMAConsulting/CRM-20464