Merge branch 'hotfix/parse_error'
fixes to item_image
Merge branch 'hotfix/item_image_fix' into develop