Merge branch 'sb/blame-color' into jk/banned-function