Progress: resuming the wizard and navigating back/forward within the wizard.
Merge from master.