Merge branch 'ss/msvc-path-utils-fix'