Export Wizard: upcoming changes

Follow