CON-561 | HubsV2 removal, improvements after CR