Merge remote-tracking branch 'origin/main' into feat/entire-trail-checkout-worktree