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