Merge "logpersist: missing X"