Merge branch 'js/msvc-build-fix'