#3539 fix-3480

Merged
liuzx merged 3 commits from fix-3339 into V20221228 1 year ago