Merge branch 'ys/fsck-commit-parsing'