Merge pull request #7660 from JMAConsulting/CRM-16188-2