Replace user marks to user links if user exists
Merge branch 'berlin-user-marks-links' into berlin