SWIG, Java, etc.
Packaging fix
Fix
SWIG workaround