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