Plane: start preparing for 3.1.2