Merge "Re-enable 'check_trust_roles'"