WEBSPARK-286 - Part 1, before Panopoly update