Merge "Use user's full name even when email is not configured" into stable-2.6