can't persist user
Merge branch 'dev-02-local'