Merge branch 'complex_fixups' into 'NIFTy_6'

Complex fixups

See merge request !497
14 jobs for NIFTy_6 in 10 minutes and 22 seconds (queued for 33 seconds)