Merge pull request #8396 from JMAConsulting/CRM-18406