Merge branch 'set_items'