Merge branch 'sg/diff-multiple-identical-renames'