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