Merge "Flush the partial bucket when startd shuts down or config updated." into pi-dev