Merge pull request #10311 from JMAConsulting/CRM-20530