Merge "Checkpoints: Support validation and roll forward on fail"