Merge branch 'ff/java'