Merge "Change Checkpoint API to return total number of checkpoints"