Merge "Fix a socket leak" into main