Updated submodules with NonConsumableItem migration