Merge branch 'nd/worktree' into maint