Merge "Add wait for start jobs"