CON-1142 | HubsV2 removal - fixes after CR