Merge remote-tracking branch 'origin/NIFTy_7' into switch_to_ducc

12 jobs for switch_to_ducc in 25 minutes and 14 seconds (queued for 3 seconds)