Merge "Additional validation for names/identifiers"