From f66939d71f3d64eb2ca96b9d6ea69b0e9085f767 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 29 May 2026 16:25:39 +0000
Subject: [PATCH] =?UTF-8?q?cherry-pick=20of=20#25857=20failed=20=E2=80=94?=
 =?UTF-8?q?=20resolve=20conflicts=20manually?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Cherry-pick of 22cbf85e964a7bb614203f3f14aa3998d0628e1c onto release/2.34 had conflicts.
To resolve:
  git fetch origin backport/25857-to-2.34
  git checkout backport/25857-to-2.34
  git cherry-pick -x -m1 22cbf85e964a7bb614203f3f14aa3998d0628e1c
  # resolve conflicts
  git push origin backport/25857-to-2.34