[cherry-pick][branch-2.9] fix cherry-pick #17609 #17957 import#18793
Merged
congbobo184 merged 6 commits intoapache:branch-2.9from Dec 7, 2022
Commits
Commits on Dec 7, 2022
- committed
congbobo184 - committed
congbobo184 - committed
congbobo184 - committed
congbobo184 - committed
congbobo184 - committed
congbobo184