Merge branch 'es/diff-color-moved-fix'