Merge pull request #18698 from seamuslee001/test_dev_core_2053