Merge branch 'master' into inline_java_optimization