Merge "Update Environment fallback defaults."