Merge branch '2021-09-17-TI-platform-updates'

- Assorted bugfixes for TI platforms