Merge pull request #7919 from JMAConsulting/CRM-18152