fix bugs in checkpoint initial synchronization and update logic
merge