Backport 0.10 checkpoints