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