Merge branch 'GNUtoMS-vs2022' into release-3.21

Merge-request: !6695