Merge pull request #50863 from SimonVerhoeven