Merge remote-tracking branch 'marcin/jvm_client' into jvm_client
Merge remote-tracking branch 'marcin/jvm_client' into jvm_client