Merge pull request #9808 from seamuslee001/CRM-19972