Signed-off-by: Guanghao Zhang <zghao@apache.org> (cherry picked from commit 2662607b716bab12d5f01de013ba3349cff0d78c)