Merge pull request #11660 from JMAConsulting/CRM-21754