Merge branch 'js/maint-diff-color-words' into maint