xcodebuild fixing
Merge branch 'release/r6p2'