Merge branch 'dp/worktree-repair-in-usage'