PWEB-4062 - Checkpoint