8 Commits (JNI-120)