rpearce/grichards: Finish persistent storage policy