Merge branch 'js/visual-studio'