8 Commits (JNI-130)