Merge pull request #18403 from seamuslee001/dev_core_1486