Merge branch 'nr/diff-highlight-indent-fix'