swift

ba820530 - Merge pull request #38450 from slavapestov/generic-environment-cleanup-redux