Ark
Backport #28113 by @lunny Fix #27901 Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com> (cherry picked from commit c997e90738)
c997e90738