Merge branch 'persistent-session'