update user_params
Merge branch 'dev'