Merge "Reorder server and port creation for overlap"