Merge branch 'persistent' into stash-client

Same changes persistent merged in.....