Philipp/integrate while and return

Merged Philipp von Spinn requested to merge philipp/integrate_while_and_return into master

Merge request reports