Rebase from upstream project.