From f6431d3f8d25c7a6453dc631320a65778eacc918 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 13 Aug 2026 16:38:40 +0000
Subject: [PATCH] Cherry-pick of #28076 requires manual resolution

The automatic cherry-pick of d509e1e6a03ff7d88996cb637acc0ef5c131e950 to release/2.29 had conflicts.
Please cherry-pick manually:

    git cherry-pick -x -m1 d509e1e6a03ff7d88996cb637acc0ef5c131e950