Merge "Fix bug in UserManager#getUserName" into sc-dev