Hotfix: OPENUCB-300: Panopoly 1.6 Updates