NET: Refresh net/iob with code from master repository
Minor tweaks to remove new compilation errors because of new iob