Feature/generalize cvfe

Merged Timo Koch requested to merge feature/generalize-cvfe into master

Merge request reports