7 Commits (JNI-172)