Rebase to 3.0.1-b2