Merge pull request #22341 from MegaphoneJon/core-3013