Merge branch '2019-10-24-ti-imports'