rename
intermediate commit
item properties
fix bug with mixed entities and items
intermediate commit