Fix/checkpoint timeloop

Merged Timo Koch requested to merge fix/checkpoint-timeloop into master

Merge request reports