Merge branch 'nd/export-worktree' into maint