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