Merge pull request #10296 from JMAConsulting/CRM-20515