Plane: preparing for 2.71-beta