Merge remote-tracking branch 'dev/NIFTy_5' into NIFTy_5

10 jobs for NIFTy_5 in 12 seconds (queued for 2 seconds)