upstream 8.0.2

resolve #1