Merge branch 'rs/simplify-parsing-commit-tree-S'