Merge branch 'ac/color-graph'