42b2541cb5
Backport #31054 by @lunny Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Backport #31054 by @lunny Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>