Stable state, rebased commits into one.