merge with inet-framework