Merge branch 'jc/fsck-dropped-errors' into maint