Cherry picking #25749 onto branch release-2.8, This PR/issue was created by cherry-pick action from commit cd719aff274b51ff90e651879cf1a28881591e21.,
Cherry picking #25749 onto branch release-2.8,
This PR/issue was created by cherry-pick action from commit cd719af.,