Merge pull request #19199 from seamuslee001/dev_core_2242