Merge pull request #23602 from kainuk/core-3369