Merge branch 'ks/recursive-rename-add-identical'