Manual merge with unstable branch.