0ee51a5221
Backport #24699 by @lunny Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Backport #24699 by @lunny Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>