Added fork support to discovery and ios_wrapper
Merge origin/master