6a5b8eb7b6
Backport #23971 by @lunny Fix #23966 Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Backport #23971 by @lunny Fix #23966 Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>