fix: generic env handling #5811
Mergedschiller-manuel(GitHub profile, opens in a new tab)merged 2 commits into
main fromrefs/pull/5811/headmerged by schiller-manuel(GitHub profile, opens in a new tab)