Merge branch 'jn/fsck-ident'