Nifty7 transition

Merged Philipp Arras requested to merge nifty7_transition into NIFTy_7

Merge request reports