V3 Trust API support
...and the rest of the commit