Merge pull request #9411 from seamuslee001/CRM-19509