OPENUCB-374: Hotfix for Panopoly 1.11