From 10a1037e9f491ab2e58fff0497312305aebc5970 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:34 +0000
Subject: [PATCH] Cherry-pick of #28078 requires manual resolution

The automatic cherry-pick of bca5d72c1c58b0efcf131c401db9481555d1645b to release/2.36 had conflicts.
Please cherry-pick manually:

    git cherry-pick -x -m1 bca5d72c1c58b0efcf131c401db9481555d1645b