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