Merge branch 'revert-vs-msbuild-arch' into release-3.14

Merge-request: !3090