Merge pull request #50650 from nosan