Merge pull request #26030 from squeek502/windows-cleanup