Merge branch 'tb/fsck-no-progress'