Merge branch '247-item-rewrite'