Merge branch 'jk/diff-highlight'