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