Ashwin/Melanie | #3076 | Removing duplicates from entity types.