Merge Configuration Wizard updates