8.0 fix wizard menus

Merged Sebastian Kennedy requested to merge 8.0-fix-wizard-menus into 8.0-stage

Merge request reports