Merge pull request #11769 from JMAConsulting/CRM-21806