Merge "Fix JNI method called with exception pending" into klp-dev