Merge pull request #10833 from JMAConsulting/CRM-20800-rc