Merge branch '2019-08-24-master-imports'