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