Merge branch 'es/worktree-code-cleanup'