CON-561 | HubsV2 removal - fixes after CR