Merge pull request #7841 from JMAConsulting/CRM-16526-2