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