Merge branch '2019-07-31-ti-imports'