Cleanup/fs 338 3pwateroil

Merged Kilian Weishaupt requested to merge cleanup/fs-338-3pwateroil into master

Merge request reports