Rebase to upstream version