GR-69  trust relationships

@knutsenm Review GR-70 first. This branch includes GR-70.
Is it safe to not alias this and entity_types?