Added wait_on_start=True.