Signed-off-by: Duo Zhang <zhangduo@apache.org> (cherry picked from commit ea9bc92ce2aa43a18c944b10153678f86eca2d7a)