Cherry picking #25647 onto branch release-2.8, This PR/issue was created by cherry-pick action from commit 7b1b967674ead6219110fc6715987c5e0f1fd067.,
Cherry picking #25647 onto branch release-2.8,
This PR/issue was created by cherry-pick action from commit 7b1b967.,