Merge branch 'vr/msvc' into next