Merge pull request #18988 from seamuslee001/dev_core_2197