Merge "Use correct Statuses from Checkpoint code"