Merge branch 'tk/typofix-connect-unknown-proto-error' into maint