Merge "Support unlimited pending checkpoints"