merge with inet-2.3