Merge branch 'AppleClang-cxx20-cxx23-flags' into release-3.22

Merge-request: !7063