Merge pull request #10301 from JMAConsulting/CRM-20510