Another checkpoint for v1.2