Merge "Refactor out originalClientPid in connectHelper." into main