commit jni before merge latest
latest merged