Merge branch 'jk/fsck-connectivity-check-fix'