Fixed NO_ID bug
Merge branch 'master' into inventory_add