wxiaoguang
94fbd44bac
Backport #24151 Fix #23816 <img width="519" alt="image" src="https://user-images.githubusercontent.com/2114189/232283304-21f56e82-d80e-4199-9b14-74699d80cd20.png">