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