From 4c192ad8f9f1c7ff023a3b418f097d179c005820 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 20 Apr 2026 05:37:05 +0000
Subject: [PATCH] Cherry-pick of #4175 requires manual resolution

To resolve, run:  git cherry-pick eacf112fa410e9c87827e6a88b87bb5c0e87d700