Nifty7 changes

Merged Philipp Arras requested to merge nifty7_changes into NIFTy_8

Merge request reports