Merge branch 'flang-windows' into release-3.24

Merge-request: !7818