Merge pull request #10467 from JMAConsulting/CRM-20682