Merge pull request #9876 from JMAConsulting/CRM-20158