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

12 jobs for nifty6to7 in 45 seconds (queued for 3 seconds)