Merge branch 'nd/reset-setup-worktree' into maint