Merge branch '2019-05-04-master-imports'