Add checkpoints to ease preprocessing error investigation
Merge branch 'feature/insert-cpp_checkpoint' into develop