Merge branch 'jc/fsck-default-full'