Merge branch 'backport-4.2-ci-xcode-26.4' into ci-xcode-26.4