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