Merge with inet-2.4