Merge branch 'nd/per-worktree-ref-iteration'