Merge pull request #17986 from seamuslee001/dev_core_1913_alternate