7 Commits (JNI-120)