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