Merge "Rejecting EI types with no schema"