Merge branch 'nifty6tonifty7' into 'NIFTy_7'

Nifty6tonifty7

See merge request !526
12 jobs for NIFTy_7 in 13 minutes and 42 seconds (queued for 1 second)