Merge branch 'jc/fsck' into next