Merge "Don't import Id/Key/NameKey directly"