Merge "bugfix: don't show name in nickname field" into lmp-mr1-dev