Merge branch 'jc/fsck' (early part)