Merge pull request #17619 from seamuslee001/dev_core_1823_alt