Merge "Sync up env template with env file changes"