Merge branch '2020-07-31-more-env-updates'