build-env todos
Merge pull request #813 from expa/build-env

build-env todos