Merge branch '2020-06-30-minor-TI-board-updates' into next