Merge branch 'preptw' into 'NIFTy_7'

Implemente pre-nonlineariaties

See merge request !610
12 jobs for NIFTy_7 in 12 minutes and 22 seconds (queued for 1 second)