Merge branch 'master' into code_generator
Merge 'upstream/code_generator'