Cherry picking #22826 onto branch release-2.4, This PR/issue was created by cherry-pick action from commit 502da35cbdf36cce8607027a3e70f22c515ca831.,