4effe769e2
Reapplying the commit from PR #101508 merge, without staging changes.
(cherry picked from commit 0594e27df3)