CON-561 | HubsV2 removal fix