Merge branch 'sb/blame-color'