Cherry picking #25634 onto branch release-2.8, This PR/issue was created by cherry-pick action from commit ba6992bf1f144c475df1111af2aaea46d0a54e55.,
Cherry picking #25634 onto branch release-2.8,
This PR/issue was created by cherry-pick action from commit ba6992b.,