Merge pull request #25993 from squeek502/windows-paths