HELP-12313: properly handle the connectivity collection
Merge branch 'refs/heads/HELP-12313' into 1.1