Merge pull request #2622 from abays/connectivity