Merge branch 'es/worktree-add' into maint