Improve compatibility with Java code

This version improves compatibility when library is used from Java code.

See build details and artifacts at buddybuild:
https://dashboard.buddybuild.com/apps/5933de925161b7000159e901/build/593cf4d9ef9f0d0001bd71b6