Merge branch 'rename-path'