Merge branch 'mr/msvc-link-with-invalidcontinue'