Backport avatarUrl from master