Merge pull request #16240 from MegaphoneJon/core-1512