Merge branch 'vr/msvc'