Cherry picking #24631 onto branch release-2.6, This PR/issue was created by cherry-pick action from commit c627b687550bf648757ea1de0b96d27782ca0a46.,