trusty now has upstream support