Merge "logpersist: Additional barrier"