Merge branch 'sb/range-diff-colors'