Merge pull request #6431 from JMAConsulting/CRM-16526