handling of java-only
add changes
Merge branch 'release/0.3.2' into develop