Fix #7959 - new project flow - use void func to callback after each step, tidy up...