Merge "Add support for checkpointing"