Issue #2370483: patch panopoly for menu link issue