Merge branch 'sb/diff-color-moved-config-option-fixup'