Continue upstream work on ucommon::Socket