ref: refs/heads/fix/e2e-bugs-2026-05-01
