Merge branch '2019-04-11-ti-master-imports'