adding variation.display and individual.variation_set_id
Merge branch 'dev'