Cherry picking #23416 onto branch release-2.5, This PR/issue was created by cherry-pick action from commit 8aa0be8d3876dac29d984353a6daa749abf50b37.,