Merge branch 'jk/fsck-exit-code-fix' into maint