Merge branch 'next' into msvc2