User profile and account links was improved
Merge remote-tracking branch 'origin/develop' into develop