Merge pull request #50773 from xfocus3