Merge branch 'test-xcode-14.3' into release-3.24

Merge-request: !8392