JBIDE-16606 - change new wizard workflow