Issue #2141119 by kim.pepper: Fixes changes to menu_ui and MenuTree