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