Merge "registration: Improve schema validation for some properties"