Merge branch 'jk/diff-highlight-module' into maint