Merge: from item_pooling
Fixes NRE when saving a player that was killed while crafting items and returned items would stack with existing inventory items
Tests: crafted low grade fuel with 1 extra fat in the inventory, killed before finishing the craft and saved the session on the server - no NRE