Code

Merge branch 'lt/rename-no-extra-copy-detection'