Merge "Add a port id validation before handling the manual port select."