8.0 fix wizard return

Merged Sebastian Kennedy requested to merge 8.0-fix-wizard-return into master

Merge request reports