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