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