Merge "API Review: Documentation improvement for standby buckets" into pi-dev