Merge branch 'NIFTy_4' into diag_hack

1 job for diag_hack in 5 minutes and 47 seconds (queued for 3 seconds)