Checkpoint after SDK V.23 Update