Cherry-pick of #25793 requires manual resolution

The automatic cherry-pick of 61a9c4a61d to release/2.32 had conflicts.
Please cherry-pick manually:

    git cherry-pick -x -m1 61a9c4a61d
This commit is contained in:
github-actions[bot]
2026-06-01 13:05:29 +00:00
parent 443bc1a338
commit 1814e6a0a6

Diff Content Not Available