Feature/new 3pwateroil

Merged Holger Class requested to merge feature/new-3pwateroil into master

Merge request reports