Merge branch 'bh/diff-highlight-graph'