Merge branch 'jt/fsck-code-cleanup'