Split ios simulator configuration
Merge branch 'update' into update.macosx