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