Merge branch 'jk/diff-rename'