Update and separate Rebase build-step diagrams