Merge "Second chunk of Support_PortManager removal."