Merge branch 'jk/diff-graph-cleanup'