Merge branch 'ms/msvc'