user profile refactoring
user profile refactoring updates
Merge remote-tracking branch 'origin/develop' into refactor-user-profile