Merge pull request #8546 from JMAConsulting/CRM-18807