Signed-off-by: Xiao Chen <xiao@apache.org> (cherry picked from commit 6ccb809c2d38a45e716153ba16e135cb76167b2b)