Merge "add more stages for init"