4.0b1 to 3.1.3