using of env fixes
Merge branch 'master' into oext