Merge with inet 2.5