Merge branch 'item_sort_key'