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