merge fixes for ip address validation