Merge branch 'gs/commit-graph-progress'