Merge branch 'vs-default-platform' into release-3.14

Merge-request: !3246