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