Merge branch 'ds/commit-graph-octopus-fix'