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