Merge pull request #9997 from JMAConsulting/CRM-20284