Refactoring done to user features
Merge remote-tracking branch 'origin/update-mail' into update-mail