Merge "Use name as fallback of displayName"