Merge branch 'sg/commit-graph-cleanups' into master