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