Merge branch '2019-08-11-ti-imports'