Merge "Resolve uid / pid early during connection" into main