Rebase to 0.9.1