Merge branch 'ks/maint-getenv-fix'