Upstream updates from Panopoly