HELP-12313: properly handle the connectivity collection