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