11.0 fix wizard

Merged Julián Corso requested to merge 11.0-fix_wizard into 11.0-stage

Merge request reports