Merge branch 'jk/diff-color-moved-fix' into maint