#4412 fix-4083

Merged
chenyifan01 merged 2 commits from fix-4083 into V20230628 10 months ago