Merge branch 'sb/diff-color-move-more'