Checkpoint before merging with master