Merge branch 'es/worktree-add'