Merge pull request #11349 from JMAConsulting/CRM-21468