Merge 2.2.0.33 from upstream/master
Update Xcode project after merge