#4808 fix-4698

Merged
ychao_1983 merged 2 commits from fix-4698 into V20231018 6 months ago