Merge "Persist data to disk when system shuts down" into pi-dev