a little profile improvements
Merge branch 'feature/profile-improvements' into develop

* feature/profile-improvements:
  a little profile improvements