[2pnc] Fix/2pnc

Merged Timo Koch requested to merge fix/2pnc into next

Merge request reports