merge fixes in ip validation