Merge remote-tracking branch 'origin/NIFTy_7' into various_pa