Fix/3pwateroil

Merged Kilian Weishaupt requested to merge fix/3pwateroil into master

Merge request reports