Linearization logic fixups

Merged Philipp Arras requested to merge linearization_logic_fixups into NIFTy_6

Merge request reports