Merge pull request #9679 from seamuslee001/CRM-18464