Merge "change ipv6 format to pass on postgresql"