d0a39bc3a4
Backport #37130. Only one merge conflict in lockfile. --- This PR was written with the help of Claude Opus 4.6 Co-authored-by: Claude (Opus 4.6) <noreply@anthropic.com>