#1861 fix issue

Merged
liuzx merged 3 commits from fix-temp_0411 into V20220415 2 years ago