Merge branch 'rename-item_type' into SetProperty