Cherry picking #23402 onto branch release-2.5, This PR/issue was created by cherry-pick action from commit 940c883e668569951761a69dd67a9eed7d8c115a.,