Merge branch 'xcode-ios-compiler-id' into release