#2344 fix-2208

Merged
ychao_1983 merged 2 commits from fix-2208 into V20220630 1 year ago