Merge pull request #9398 from seamuslee001/CRM-19562