Merge pull request #15019 from MegaphoneJon/core-1182