Merge branch '2021-09-10-assorted-TI-updates'

- A number of TI platform bugfixes