Fix/improve epsilon timeloop finished

Merged Timo Koch requested to merge fix/improve-epsilon-timeloop-finished into master

Merge request reports