can't persist user
Merge branch 'dev'