Merge "port validator"