9f14b2173a
Backport #26885 by @lunny Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Backport #26885 by @lunny Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>