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