Merge remote-tracking branch 'local/msvc-updates' into msvc-updates