Merge branch 'NIFTy_4' into move_multi

5 jobs for move_multi in 2 minutes and 51 seconds (queued for 1 second)