Merge branch 'ef/setenv-putenv' into next