Merge branch '2021-10-11-TI-platform-updates'

- Assorted TI platform updates