Merge with inet integration
Hip port, initial changes