CHECKPOINT before integrating the new version of javaFMI