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