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