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