Skip to content

fix: cherry-pick #13078 and #13046#13123

Merged
kwannoel merged 2 commits intov1.3-rcfrom wangzheng/v1.3-rcNov 1, 2023