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