Merge branch 'jk/diffcore-rename-duplicate'