Backport #27326 by @lunny Fix #27306 Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com> (cherry picked from commit b6b71c78c4)
b6b71c78c4