Issues #2854096 : Add custom hook to allow custom menu structure.
Issue #2729177 by geoffray: Missing return statement.