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