rebase to 1.0.2, supports for 7.0.2