Merge pull request #7475 from JMAConsulting/CRM-16259-1