Finish updating-users
Merge branch 'feature-updating-users'