From 628d23454f056625484b16981bcc9ca4df9e3bce Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 29 May 2026 06:27:16 +0000
Subject: [PATCH] Cherry-pick of #4314 requires manual resolution

To resolve, run:  git cherry-pick 3499785cbf5947be3e2df914b9ed32388161d745