final env updates after merge to master