Cleanup/2pnc 2pncmin models

Merged Thomas Fetzer requested to merge cleanup/2pnc-2pncmin-models into master

See also merge issue 355

Merge request reports