CON-561 | Hubs V2 removal fix