9 Commits (JNI-104)