Merge pull request #10901 from JMAConsulting/CRM-21106