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