Cleanup/epsilons next

Merged Timo Koch requested to merge cleanup/epsilons-next into next

Merge request reports