Nifty 2

Theo Steininger requested to merge NIFTy_2 into master

Merging the changes from theos into master.

Merge request reports