Merge branch '2019-11-20-env-migration'