Fix update user
Merge branch 'dev' into change_route