Merge branch 'linearization_logic_fixups' into 'NIFTy_6'

Linearization logic fixups

See merge request !427
9 jobs for NIFTy_6 in 17 minutes and 39 seconds (queued for 3 seconds)