Merge pull request #8730 from JMAConsulting/CRM-16189-41