merge with inet-framework integration