Merge "Add port_present client state"