Merge branch 'msvc' into maint