[merge] from new config wizards