Merge "Offer to wait until broadcasts have drained." into oc-dev