Functional

Merged Meike Wienholt requested to merge functional into develope

Merge request reports