Merge "add wait_for_instantiate"