CON-561 | Hubs V2 removal - fixes after merge