Small change on load path environment var lookup
Fix generated code for volatile field references
Merge remote-tracking branch 'upstream/master'