Merge "Remove unnecessary schema check of ip address"