Merge pull request #16455 from MegaphoneJon/core-1568