Merge branch 'es/worktree-add-cleanup' into maint