Merge branch 'clang-msvc-help' into release-3.10

Merge-request: !1373