Rebase after upstream bump