Merge "Fix IndexOutOfBoundsException in HubEndpointInfo" into main