Merge branch 'vs2017-sdk81' into release-3.14

Merge-request: !2962