2025.08.07-3

Cherry pick release
Push hero is @diox

Previous Release: 2025.08.07-2

Blockers:

Cherry-picks:

• fec2a97

Before we push:

Before we start:

Before we promote:

After we're done:

Full Changelog: 2025.08.07-2...2025.08.07-3