Merge ios-init to develop