Merge: from main/item_pooling This fixers the NRE on server tick (and blocker for joining). Tests: loaded a save that consistently produced NREs - not anymore