Merge branch 'msvc0' into next1