Merge branch 'rj/msvc-fix' into next