Merge branch 'jc/transport-do-not-use-connect-twice-in-fetch' into maint