Rebase and update WIP patch.