trio upgrade and integration
36 files changed