Sync with pingpong/trusty package