Merge pull request #10799 from JMAConsulting/CRM-21002