Cherry-picking a PR to v3

Since August 2026, main is the v4 codebase. Stable v3 releases come from the v3 branch. A change that needs to reach customers in v3 must first merge to main, then be backported as a second PR against v3 with the same changes translated back to v3 conventions.

Workflow