Merge branch 'msvc-c++23' into release-3.21

Merge-request: !6614