Merge branch 'rs/commit-graph-code-simplification'