Merge branch 'vs-win-sdk' into release-3.14

Merge-request: !2989