User profile fixes.
Merge remote-tracking branch 'origin/master'
User profile fixes.