Merge branch 'jc/fsck-fixes' into maint