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