Backport #26885 by @lunny Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com> (cherry picked from commit 9f14b2173a)
9f14b2173a