Merge branch 'ci-xcode-14.1' into release-3.24

Merge-request: !7863