New option batch_max_wait_time