Merge branch 'kb/msvc-compile'