Issue #2361045: Update panopoly