Signed-off-by: Yulin Niu <niuyulin@apache.org> (cherry picked from commit bd7a78add5aaac090d6ea0b1951778fe24542b70)