Merge "Refactored port retrieval to include PortSettigs."