Merge "IpPrefix improvements."