Merge pull request #13237 from MegaphoneJon/core-571