Merge with inet-framework