Merge pull request #16287 from MegaphoneJon/core-1524-rc