Merge "Clarify meaning of --port flag" into main