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