Merge pull request #7907 from JMAConsulting/CRM-18149