CON-549: Preparation for Hubs changes