Merge "refactor(tc): use internal trusted storage" into integration