Merge branch 'backport-3.28-ci-xcode-15.3'