Merge pull request #17645 from MegaphoneJon/core-1826