Merge pull request #10806 from JMAConsulting/CRM-20610-2