Plane refactor

Merged Niklas Haas requested to merge plane_refactor into master

Merge request reports