Item package development. Need to link ItemModel to actual item.
Merge origin/master