Merge pull request #7476 from JMAConsulting/CRM-16259-4