Merge "Move methods for handling external usernames to a dedicated class"