8 Commits (JNI-106)