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