Merge with inet-framework integration