Support persistent storage
Merge branch 'refs/heads/persistent'