Merge branch 'jc/fsck'