merge with inet 2.1