Merge branch 'nifty6to7' into 'NIFTy_7'

Nifty6to7

See merge request !533
12 jobs for NIFTy_7 in 11 minutes and 47 seconds (queued for 4 seconds)