Merge with inet-framework 2.1