Merge branch 'en/merge-rename-rename-worktree-fix'