7e9a895007
Backport #31712 by @lunny Fix #31708 Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Backport #31712 by @lunny Fix #31708 Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>