Merge "Implement PortNumberBuilder"