Sync objc version pr by Pretz