Merge pull request #19088 from seamuslee001/dev_core_2227