Merge branch 'backport-xcode-duplicate-file-refs' into release