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