Quick update before 1.6.1
Checkpoint