Merge pull request #23101 from MegaphoneJon/core-1836-js