Merge branch 'nd/corrupt-worktrees' into maint