a3ccbb5b7f
Backport #19171 Fix #19166 Signed-off-by: Andrew Thornton <art27@cantab.net> Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>