Merge remote-tracking branch 'origin/NIFTy_5' into mf_new

9 jobs for mf_new in 5 minutes and 30 seconds (queued for 1 second)