Merge "Add supportsCheckpoint"