Clarify when environment variables are made available
Merge remote-tracking branch 'upstream/master'
Limit frame to command module