Merge "Initial changes towards Generic JNI option"