Merge "Fix connect() retry loop." into main