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