#1762 fix-1591

Merged
wangjr merged 4 commits from fix-1591 into V20220328 2 years ago