Merge branch 'java-api' into next