Feature/freeflow misc

Merged Kilian Weishaupt requested to merge feature/freeflow-misc into master

Merge request reports