Minor cleanup.
Merge branch 'ensure-availability-output' into ensure-availability-bulk-api