Merge branch 'nd/worktree-list-fixup' into maint