Merge branch 'lt/diff-rename'