Reapply #27200 after bad conflict resolution (#27446)

Release Notes:

- N/A
24d76a64c3Agus Zubiaga committed on 3/25/2025, 6:06:45 PM· committed by GitHubparent3ba6243
1 file changedLine totals unavailable