Merge branch 'ja/worktree-orphan' into maint-2.42