Merge pull request #16087 from seamuslee001/deb_core_1467