Signed-off-by: GeorryHuang <huangzhuoyue@apache.org> (cherry picked from commit dc30ca552b37c864b962fbeaaed548523f30573b)