Merge pull request #11943 from pratu16x7/hub-connector-fixes

[fix] hub connection, fixes #11357