Merge "Test env updates"