Merge pull request #2697 from cloudflare/sync/staging-next-2026-04-17

Merge pull request #2697 from cloudflare/sync/staging-next-2026-04-17 #14013