Fix nonconforming interpolation

Sander, Oliverrequested to merge
fix-nonconforming-interpolation into master

Recent refactoring broke nonconforming interpolation. This MR fixes the problems.

Merge request reports