From 19ccad266b674c7215070ecc0aa0f297bb166604 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 14 Aug 2026 16:50:42 +0000
Subject: [PATCH] Cherry-pick of #28085 requires manual resolution

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

    git cherry-pick -x -m1 3145cc8386f9b3a6d2e43a78556a1717e2869f79