Merge "Fix the overflow issue in Checkpoint"