#4038 fix-3956 fix-3955

Merged
chenshihai merged 5 commits from fix-3956 into V20230425 1 year ago