- Optimize environment data copy allocation
Merge remote-tracking branch 'upstream/master'