Merge pull request #9930 from JMAConsulting/CRM-20193