From bd590cdd1f07af26cae1c92902ffa75601d92306 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 13 Aug 2026 19:34:47 +0000
Subject: [PATCH] Cherry-pick of #28144 requires manual resolution

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

    git cherry-pick -x -m1 93c6faf1de78b9cbe930295d61abbffd8db6971c