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