a2f52f3561
Backport #24274 by @lunny Fix #24125 Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com> Co-authored-by: silverwind <me@silverwind.io>