Merge branch 'nifty627' into 'NIFTy_7'

Nifty627

See merge request !543
12 jobs for NIFTy_7 in 12 minutes and 33 seconds (queued for 3 seconds)