Cherry picking #25750 onto branch release-3.0, This PR/issue was created by cherry-pick action from commit e29a68a17bebaffa0ee60ccea9159acdeb03c7a0.,
Cherry picking #25750 onto branch release-3.0,
This PR/issue was created by cherry-pick action from commit e29a68a.,