Add user marks and display them as fullname
Merge branch 'berlin-add-user-marks' into berlin