#4605 fix-4304

Merged
ychao_1983 merged 2 commits from fix-4304 into V20230808 9 months ago