We should consider removing PortResolver as it leads to confusion is likely no longer necessary. See gh-8140 gh-12971
