Merge pull request #10397 from JMAConsulting/CRM-20620