Merge with inet 2.1