Merge branch 'jt/connectivity-check-after-unshallow'