Switching from menu-blocks to menu-trees (same module).
Merge branch 'menu_trees'