Merge branch 'js/diff-color-check'