rebase on devbase, and squash the build steps.