Merge remote-tracking branch 'origin/NIFTy_6' into do_cleanup

8 jobs for do_cleanup in 8 minutes and 13 seconds (queued for 2 seconds)